From 87b6664073939e34dbc656f56342bd27ae1e1f91 Mon Sep 17 00:00:00 2001 From: Lars Hamann Date: Thu, 22 Oct 1998 14:54:28 +0000 Subject: [PATCH] samll fix for invisible columns Thu Oct 22 16:22:55 1998 Lars Hamann * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible columns --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkclist.c | 13 +++++++------ 8 files changed, 42 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index fec3e3822c..4d4c49df17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 22 16:22:55 1998 Lars Hamann + + * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible + columns + Thu Oct 22 02:29:53 1998 Tim Janik * gtk/gtkfilesel.h: GtkType and macro fixups diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index fec3e3822c..4d4c49df17 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Thu Oct 22 16:22:55 1998 Lars Hamann + + * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible + columns + Thu Oct 22 02:29:53 1998 Tim Janik * gtk/gtkfilesel.h: GtkType and macro fixups diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fec3e3822c..4d4c49df17 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Oct 22 16:22:55 1998 Lars Hamann + + * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible + columns + Thu Oct 22 02:29:53 1998 Tim Janik * gtk/gtkfilesel.h: GtkType and macro fixups diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index fec3e3822c..4d4c49df17 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu Oct 22 16:22:55 1998 Lars Hamann + + * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible + columns + Thu Oct 22 02:29:53 1998 Tim Janik * gtk/gtkfilesel.h: GtkType and macro fixups diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index fec3e3822c..4d4c49df17 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Oct 22 16:22:55 1998 Lars Hamann + + * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible + columns + Thu Oct 22 02:29:53 1998 Tim Janik * gtk/gtkfilesel.h: GtkType and macro fixups diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fec3e3822c..4d4c49df17 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Oct 22 16:22:55 1998 Lars Hamann + + * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible + columns + Thu Oct 22 02:29:53 1998 Tim Janik * gtk/gtkfilesel.h: GtkType and macro fixups diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fec3e3822c..4d4c49df17 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Oct 22 16:22:55 1998 Lars Hamann + + * gtk/gtkclist.c (COLUMN_FROM_XPIXEL): samll fix for invisible + columns + Thu Oct 22 02:29:53 1998 Tim Janik * gtk/gtkfilesel.h: GtkType and macro fixups diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 6e048f4ad6..25a85e6c57 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -71,13 +71,14 @@ COLUMN_FROM_XPIXEL (GtkCList * clist, gint i, cx; for (i = 0; i < clist->columns; i++) - { - cx = clist->column[i].area.x + clist->hoffset; + if (clist->column[i].visible) + { + cx = clist->column[i].area.x + clist->hoffset; - if (x >= (cx - (COLUMN_INSET + CELL_SPACING)) && - x <= (cx + clist->column[i].area.width + COLUMN_INSET)) - return i; - } + if (x >= (cx - (COLUMN_INSET + CELL_SPACING)) && + x <= (cx + clist->column[i].area.width + COLUMN_INSET)) + return i; + } /* no match */ return -1; -- 2.30.2